Compile fixes after merge
Merge fixes