Small fixes about mutt