Bug 1020644 - Post-review changes