Further deployment fixes