More compatibility stuff in Compiler plugin