Minor deployment improvements