Bug 1057075 Improvements