Fixes for Chrome Web Store