Tiny bug fix and typo fixes