fix various compatibility issues with build 69564