Some cleanups...