Fixed more deploy bugs