Slight cleanups...