Some minor cleanups pre-merge