Fix null attributes