fixes for compilation