Some small cleanups...