add better datadir handling for fab