Bug 1011813 addressing review comments