Grails 2 small fixes (more to come)