Compile fix part2