Fix broken Gen 2 file handling.