NOT NULL fixes