Port improvements