More fixes to file paths