Fix typing/grammar errors raised by @fcw