More changes related to Mantis issue 129.