More deploy fixes