A few cleanups and fixes from recent changes