Some fixes for google.