Oops, data dir still hard coded