Fix static port saving