Minor fixes to GCE code to build on all platforms. #3952