Fixed issues with Port width