Use cmp instead of compare
Use recent version of key.rs