More tweaks to ports