Improving homePath resolution