Some pre-deploy changes