Random port fixes