Fixes based on review comments
Finished feature 44876643/firefox-19.