Fixed data path/file functions