Fixes a few deployment issues