Bug 1045847 - Fix review comments