some small cleanups

Hi John

These are some assorted but minor cleanups.