More port fixes