Fix build and a few typos from previous commit