Some compilation errors fixed