adjust nullable fields