diff --git a/api/src/web.rs b/api/src/web.rs
index fd5bc440d..06e7547fb 100644
--- a/api/src/web.rs
+++ b/api/src/web.rs
@@ -139,7 +139,7 @@ macro_rules! right_path_element(
 		match $req.uri().path().trim_end_matches('/').rsplit('/').next() {
 			None => return response(StatusCode::BAD_REQUEST, "invalid url"),
 			Some(el) => el,
-		};
+		}
 	));
 
 #[macro_export]
diff --git a/core/src/macros.rs b/core/src/macros.rs
index 084ecf6a5..d2fa9faaa 100644
--- a/core/src/macros.rs
+++ b/core/src/macros.rs
@@ -20,7 +20,7 @@
 #[macro_export]
 macro_rules! map_vec {
 	($thing:expr, $mapfn:expr) => {
-		$thing.iter().map($mapfn).collect::<Vec<_>>();
+		$thing.iter().map($mapfn).collect::<Vec<_>>()
 	};
 }
 
diff --git a/pool/tests/block_building.rs b/pool/tests/block_building.rs
index 759602c78..c09bf506a 100644
--- a/pool/tests/block_building.rs
+++ b/pool/tests/block_building.rs
@@ -18,7 +18,6 @@ use self::core::core::hash::Hashed;
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
 use self::pool::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;
diff --git a/pool/tests/block_max_weight.rs b/pool/tests/block_max_weight.rs
index 4091b9166..90492d11f 100644
--- a/pool/tests/block_max_weight.rs
+++ b/pool/tests/block_max_weight.rs
@@ -18,7 +18,6 @@ pub mod common;
 use self::core::core::hash::Hashed;
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;
diff --git a/pool/tests/block_reconciliation.rs b/pool/tests/block_reconciliation.rs
index e38d5d942..f0c0837dc 100644
--- a/pool/tests/block_reconciliation.rs
+++ b/pool/tests/block_reconciliation.rs
@@ -17,7 +17,6 @@ pub mod common;
 use self::core::core::hash::Hashed;
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
-use self::util::RwLock;
 use crate::common::ChainAdapter;
 use crate::common::*;
 use grin_core as core;
diff --git a/pool/tests/nrd_kernel_relative_height.rs b/pool/tests/nrd_kernel_relative_height.rs
index ed43b137e..388843620 100644
--- a/pool/tests/nrd_kernel_relative_height.rs
+++ b/pool/tests/nrd_kernel_relative_height.rs
@@ -21,7 +21,6 @@ use self::core::global;
 use self::core::libtx::aggsig;
 use self::keychain::{BlindingFactor, ExtKeychain, Keychain};
 use self::pool::types::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;
diff --git a/pool/tests/nrd_kernels_disabled.rs b/pool/tests/nrd_kernels_disabled.rs
index 6c2e1f0e7..71c58bf06 100644
--- a/pool/tests/nrd_kernels_disabled.rs
+++ b/pool/tests/nrd_kernels_disabled.rs
@@ -19,7 +19,6 @@ use self::core::core::{HeaderVersion, KernelFeatures, NRDRelativeHeight};
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
 use self::pool::types::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;
diff --git a/pool/tests/nrd_kernels_enabled.rs b/pool/tests/nrd_kernels_enabled.rs
index 4dd643cd3..775e9a3b3 100644
--- a/pool/tests/nrd_kernels_enabled.rs
+++ b/pool/tests/nrd_kernels_enabled.rs
@@ -19,7 +19,6 @@ use self::core::core::{HeaderVersion, KernelFeatures, NRDRelativeHeight};
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
 use self::pool::types::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;
diff --git a/src/bin/tui/status.rs b/src/bin/tui/status.rs
index 0dead0731..4e78ca047 100644
--- a/src/bin/tui/status.rs
+++ b/src/bin/tui/status.rs
@@ -297,7 +297,7 @@ fn test_status_txhashset_kernels() {
 		kernels_total: 5000,
 	};
 	let basic_status = TUIStatusView::update_sync_status(status);
-	assert!(basic_status.contains("4%"), basic_status);
+	assert!(basic_status.contains("4%"), "{}", basic_status);
 }
 
 #[test]
@@ -307,5 +307,5 @@ fn test_status_txhashset_rproofs() {
 		rproofs_total: 1000,
 	};
 	let basic_status = TUIStatusView::update_sync_status(status);
-	assert!(basic_status.contains("64%"), basic_status);
+	assert!(basic_status.contains("64%"), "{}", basic_status);
 }