Misc small cleanups.