Minor cleanups

Minor cleanups