Third level of fixes during migration to Rust v0.7