Better homedir handling