Various fixes too make the CI green #2811

Job	Run time
cargo bench	49s
cargo clippy	25s
cargo +stable build	35s
cargo +1.36 build (futures-{core, io, sink})	1m 43s
cargo +beta build	37s
cargo doc	17s
cargo +nightly build	36s
cargo hack check --feature-powerset	2m 17s
cargo fmt	4s
cargo minimal-versions build	23s
cargo miri test	11m 24s
cargo build --target thumbv7m-none-eabi	26s
cargo test -Z sanitizer=address	3m 0s
cargo build --target thumbv6m-none-eabi	25s
cargo test -Z sanitizer=memory	3m 52s
cargo test (ubuntu-latest)	2m 30s
cargo +1.56 build	2m 1s
cargo test -Z sanitizer=thread	2m 18s
cargo test (macos-latest)	6m 38s
cargo test (windows-latest)	5m 9s
cargo test (ubuntu-latest, aarch64-unknown-linux-gnu)	3m 37s
cargo test (ubuntu-latest, armv7-unknown-linux-gnueabihf)	6m 32s
cargo test (ubuntu-latest, armv5te-unknown-linux-gnueabi)	6m 52s
cargo test (ubuntu-latest, i686-unknown-linux-gnu)	3m 27s
	1h 5m 57s

Provide feedback