More fixes to work with Google