A few deploy improvements