Some extra modifications to the compiler