Runtime lock tweaks for #66