Bug 1013519 - Review fixes
0.2.6