Bug 905629 - Review fixes