Better handling of exposed ports