Fixes from Odyssey transition

There were a few left-over merge conflict resolutions I missed, this commit addresses them.
I cloned from small.tweaks, then changed a couple of lines, and then commited.  But git tracked changes in a number of BRAMS files.  Git reports that practically the whole file changed, but a simple diff shows no differences.  I am just overlooking it, but thought I would mention.