Further deploy fixes - boy it would be nice if I could test this without pushing :V