Bug 1016277 - Addressing review comments