Assorted fixes from BD02 script.

Another check for the BDs reveals more fixes!