Offsets now set correctly: files should no longer be larger than expected.