1. Fixes for Google Analytics