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