Port and exclusions fixes