Path and file name fixes