minor fixes for Google snapshots