fixes for gce, agents