fixes for google