Null fields fixes