Update to run on the latest Cloud Foundry