Bug 905208 - Review comments implemented