Fix ports and other crap