Handle a couple of odd cases of missing values in metadata