diff --git a/zokrates_ast/src/common/flat/parameter.rs b/zokrates_ast/src/common/flat/parameter.rs
index c4a86c962..d5ac060a0 100644
--- a/zokrates_ast/src/common/flat/parameter.rs
+++ b/zokrates_ast/src/common/flat/parameter.rs
@@ -1,3 +1,6 @@
+// see https://github.com/mcarton/rust-derivative/issues/115
+#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+
 use crate::common::{Span, WithSpan};
 
 use super::variable::Variable;
diff --git a/zokrates_ast/src/ir/mod.rs b/zokrates_ast/src/ir/mod.rs
index 46c99b13f..7118c6f6e 100644
--- a/zokrates_ast/src/ir/mod.rs
+++ b/zokrates_ast/src/ir/mod.rs
@@ -74,7 +74,7 @@ impl<T: Field> fmt::Display for ConstraintStatement<T> {
             self.error
                 .as_ref()
                 .map(|e| format!(" // {}", e))
-                .unwrap_or_else(|| "".to_string())
+                .unwrap_or_default()
         )
     }
 }
diff --git a/zokrates_ast/src/typed/types.rs b/zokrates_ast/src/typed/types.rs
index 8a0614a0b..c19d4609c 100644
--- a/zokrates_ast/src/typed/types.rs
+++ b/zokrates_ast/src/typed/types.rs
@@ -97,7 +97,7 @@ impl<'ast> PartialEq for GenericIdentifier<'ast> {
 
 impl<'ast> PartialOrd for GenericIdentifier<'ast> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.index.partial_cmp(&other.index)
+        Some(self.cmp(other))
     }
 }
 
diff --git a/zokrates_ast/src/untyped/mod.rs b/zokrates_ast/src/untyped/mod.rs
index c0f77ea64..46fa1e10f 100644
--- a/zokrates_ast/src/untyped/mod.rs
+++ b/zokrates_ast/src/untyped/mod.rs
@@ -543,11 +543,8 @@ impl<'ast> fmt::Display for Range<'ast> {
             self.from
                 .as_ref()
                 .map(|e| e.to_string())
-                .unwrap_or_else(|| "".to_string()),
-            self.to
-                .as_ref()
-                .map(|e| e.to_string())
-                .unwrap_or_else(|| "".to_string())
+                .unwrap_or_default(),
+            self.to.as_ref().map(|e| e.to_string()).unwrap_or_default()
         )
     }
 }
diff --git a/zokrates_cli/src/ops/check.rs b/zokrates_cli/src/ops/check.rs
index 9e1b67834..1172f0307 100644
--- a/zokrates_cli/src/ops/check.rs
+++ b/zokrates_cli/src/ops/check.rs
@@ -95,10 +95,7 @@ fn cli_check<T: Field>(sub_matches: &ArgMatches) -> Result<(), String> {
     check::<T, _>(source, path, Some(&resolver), &config).map_err(|e| {
         format!(
             "Check failed:\n\n{}",
-            e.0.iter()
-                .map(|e| fmt_error(e))
-                .collect::<Vec<_>>()
-                .join("\n\n")
+            e.0.iter().map(fmt_error).collect::<Vec<_>>().join("\n\n")
         )
     })?;
 
diff --git a/zokrates_cli/src/ops/compile.rs b/zokrates_cli/src/ops/compile.rs
index e0b99316d..449f7ac64 100644
--- a/zokrates_cli/src/ops/compile.rs
+++ b/zokrates_cli/src/ops/compile.rs
@@ -144,10 +144,7 @@ fn cli_compile<T: Field>(sub_matches: &ArgMatches) -> Result<(), String> {
         .map_err(|e| {
             format!(
                 "Compilation failed:\n\n{}",
-                e.0.iter()
-                    .map(|e| fmt_error(e))
-                    .collect::<Vec<_>>()
-                    .join("\n\n")
+                e.0.iter().map(fmt_error).collect::<Vec<_>>().join("\n\n")
             )
         })?;
 
diff --git a/zokrates_interpreter/src/lib.rs b/zokrates_interpreter/src/lib.rs
index 9e9bff770..46d1b8526 100644
--- a/zokrates_interpreter/src/lib.rs
+++ b/zokrates_interpreter/src/lib.rs
@@ -318,8 +318,8 @@ impl Interpreter {
                     let s = x.to_dec_string();
                     <Bn256 as ScalarEngine>::Fr::from_str(&s).unwrap()
                 };
-                let i: Vec<_> = i.iter().map(|x| to_fr(x)).collect();
-                let h: Vec<_> = h.iter().map(|x| to_fr(x)).collect();
+                let i: Vec<_> = i.iter().map(to_fr).collect();
+                let h: Vec<_> = h.iter().map(to_fr).collect();
                 assert_eq!(h.len(), 256);
                 generate_sha256_round_witness::<Bn256>(&i, &h)
                     .into_iter()
diff --git a/zokrates_js/src/lib.rs b/zokrates_js/src/lib.rs
index b39d0169c..d70e145bb 100644
--- a/zokrates_js/src/lib.rs
+++ b/zokrates_js/src/lib.rs
@@ -276,13 +276,7 @@ mod internal {
             &arena,
         )
         .map_err(|ce| {
-            JsValue::from_str(
-                &ce.0
-                    .iter()
-                    .map(|e| fmt_error(e))
-                    .collect::<Vec<_>>()
-                    .join("\n"),
-            )
+            JsValue::from_str(&ce.0.iter().map(fmt_error).collect::<Vec<_>>().join("\n"))
         })?;
 
         let abi = artifacts.abi().clone();