port option handling tweaks