Fixing port issues