Fixes for locksmith