Final changes to make V0_5_Reader work.