integration of Google Analytics fixes