Some bug fixes to the compiler wrappers.