Gce fixes

A bunch of improvement to the GCE module.