Minor cleanups..