Various fixes for GCE