Fixes for google