Fixes for compilation
Fixes for compilation