Fixes Add's and Port's (3/3)