Fixes deploy bugs