Bug 905208 - Some fixes