key_commit: tweaks to fix item #2145