Minor cleanups of MCAd