A few more pulled up compiler classes