Fixed up port issues