Minor cleanups2