Compile fixes

Compile fixes