Apply KTG patch for .32 + fix build.