Assorted fixes from BD01 script.

Nothing like one last check for the BDs to tweak things.