crate lock fixes