some port fixes