Minor cleanups

Nothing major.