Fixing up port and such