Yet more deploy fixes