Pre-deploy fixes