Compatibility fixes for Grails 2.4.x