Fixes for new TH and addition of port to configuration.