Fixes for chrome webstore