Crate fixes