Fix fields that can return nil and null to type Option