- rel 2; more datadir fixes