Bug #864321 - Review fixes