Fixes for GCE API