Bug fixes with mutt