Bugfix changed more scripts baseDir to dataPath