Small fixes pre-deploy