patch related build errors: really fixed this time