Fixed some production deployment issues