Fixes for GCE

See the individual commits.