Fixed deployment bugs