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