Fix failing ports
Fix failing ports