typofix
Merge @goofy-bz typofixes