Assorted fixes from BD03 script.

More BD fixes.