Fix misc. typos from previous commit