Improvements on setup of HIF.