Fix nulls vs blanks