Tweaked a few errors with last comment PR.