Fixed deployment issues