Make readvp2 a bit more sane