More minor cleanups