crate fixes