Adding in custom ungit port handling