a couple more changes addressing the same thing in the other compilers