Fixes for Cloud Endpoints