Fixup port stuff