- Minor cleanups