MDL-25500 Lock: More cime fixes