Fixed some mutt problems