More port fixes.