small lock2key optimizations (I guess)