Fix null field FIXME.
Add missing license headers