Various cleanups to get everything compiling again

Various cleanups to get everything compiling again after Rust updates.