Bug 905208 - Minor changes