Minor fixes to compilation errors