First Run file creation bug fixes