Update fields more to spec.