files_versions cleanup

Some cleanups made when looking for bugs