Minor fixes for compilation