-ComputeEngine fixes