BISERVER-8947 - More tweaks merged in from UX