Small changes to request port mapping and sleep on connection