diff --git a/cursive-core/src/builder.rs b/cursive-core/src/builder.rs
index 3e75aea7..9f658d79 100644
--- a/cursive-core/src/builder.rs
+++ b/cursive-core/src/builder.rs
@@ -1109,10 +1109,10 @@ impl Context {
     /// Store a new variable for resolution.
     ///
     /// Can be a callback, a usize, ...
-    pub fn store<S, T: 'static>(&mut self, name: S, value: T)
+    pub fn store<S, T>(&mut self, name: S, value: T)
     where
         S: Into<String>,
-        T: Clone + Send + Sync,
+        T: Clone + Send + Sync + 'static,
     {
         self.store_with(name, move |_, _| Ok(value.clone()));
     }
diff --git a/cursive-core/src/event.rs b/cursive-core/src/event.rs
index 49a9ae10..b2316042 100644
--- a/cursive-core/src/event.rs
+++ b/cursive-core/src/event.rs
@@ -412,6 +412,7 @@ impl Key {
 
 /// One of the buttons present on the mouse
 #[derive(PartialEq, Eq, Clone, Copy, Hash, Debug)]
+#[non_exhaustive]
 pub enum MouseButton {
     /// The left button, used for main actions.
     Left,
@@ -425,7 +426,7 @@ pub enum MouseButton {
     /// Fifth button if the mouse supports it.
     Button5,
 
-    // TODO: handle more buttons?
+    // TODO: handle more buttons? Wheel left/right?
     #[doc(hidden)]
     Other,
 }
diff --git a/cursive-core/src/menu.rs b/cursive-core/src/menu.rs
index e5ed3767..8a2497cd 100644
--- a/cursive-core/src/menu.rs
+++ b/cursive-core/src/menu.rs
@@ -21,7 +21,7 @@ use crate::{
 use enumset::EnumSet;
 use std::sync::Arc;
 
-const PLAIN_1CHAR_SPAN: &'static [IndexedSpan<Style>] = &[IndexedSpan {
+const PLAIN_1CHAR_SPAN: &[IndexedSpan<Style>] = &[IndexedSpan {
     content: IndexedCow::Borrowed { start: 0, end: 1 },
     attr: Style {
         effects: EnumSet::EMPTY, // This needs a recent enough `enumset` dependency, we should bump the minimum version to 1.1.0
diff --git a/cursive/src/backends/puppet/observed.rs b/cursive/src/backends/puppet/observed.rs
index 8a84c3bd..846ccbb0 100644
--- a/cursive/src/backends/puppet/observed.rs
+++ b/cursive/src/backends/puppet/observed.rs
@@ -5,7 +5,6 @@ use crate::theme::Effect;
 use crate::Vec2;
 use std::ops::Index;
 use std::ops::IndexMut;
-use std::string::ToString;
 use std::sync::Arc;
 use std::{fmt, fmt::Display, fmt::Formatter};
 use unicode_segmentation::UnicodeSegmentation;
@@ -380,9 +379,9 @@ impl<'a> ObservedPieceInterface for ObservedLine<'a> {
     }
 }
 
-impl<'a> ToString for ObservedLine<'a> {
-    fn to_string(&self) -> String {
-        self.as_strings().remove(0)
+impl<'a> Display for ObservedLine<'a> {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        write!(f, "{}", self.as_strings().remove(0))
     }
 }