Fix ports and dependencies