key_commit: a few more tweaks for thomas