tweaks for GRAILS-10575