Fix missing data and standardize between sources.

Some tweaks to make sure the data from Trogdir and the data from
Banner are in the same format.