More changes from the deployment branch