Misc updates that I repeatedly forgot to commit.
I no longer remember what they all do.  Sorry!

Change-Id: I31db8dd97e42e5b2698122474d803db751abf290