Local fixes for our version of the compiler