CON-1790 Some tweaks