Bug 1013519 - Review fixes