Changed due to refactoring changes in dht. Few minor warnings removed.