Fixing some compilation errors