Gce fixes

Squashed merge request #6243 here.

ping @erjohnso and @jctanner.