Additional fixes and code simplification for MinReader