Fixes prompted by 1202 #5505

Job	Run time
linux (raspbian)	19m 4s
linux (aarch64-unknown-linux-gnu)	18m 10s
linux (armv6vfp-unknown-linux-gnueabihf)	24m 4s
linux (armv7-unknown-linux-gnueabihf)	15m 57s
linux (aarch64-unknown-linux-musl)	22m 34s
linux (armv7-unknown-linux-musl)	15m 57s
linux (aarch64-linux-android)	7m 32s
apple (aarch64-apple-ios)	8m 56s
linux (armv7-linux-androideabi)	7m 17s
apple (aarch64-apple-darwin)	21m 6s
linux (i686-linux-android)	7m 42s
linux (x86_64-linux-android)	7m 46s
linux (wasm32-unknown-unknown)	6m 24s
linux (wasm32-wasi)	7m 41s
	3h 10m 10s

Provide feedback