Clean deploy fixes