Fix for deprecated classes in Grails 2.0+