Mark as changed not-null fields; fix