Doc issue fix, and marking some fields as final.