more possible GRAILS-7471 improvements, should also fix #4 if this is really the problem