Changes while getting things to work on GCE