More deploy improvements