fixing issues with discovering and heatclient