Last set of minor cleanups