Fix null fields