Little fixes to file creation by data managers