Clean up a few more encoding errors.