Fixing couple of bugs in reader that was checked into different branch