Fix clippy lints (#555)