Fix several small errors.