Fixing a regression and a couple of typos