Fix remaining incoming Rust (>0.6) incompatibility issues