Compile fixes after merge.
drwxr-xr-x - src