Changes to be compatible with Grails 2.4