Use $HOME instead of ~ in some places