fixes for GCE build and run