More changes to port stuff