Made some more mutt changes