Minor cleanups

TBR