Fixed more of those annoying auto-genned typoes