THISTED-2 - Fix and set field as optional.