Further minor cleanups