More tweaks related to Mantis issue 156.