Fixed some more deploy bugs