Attempt to solve some file corruption issues