Minor cleanups...