key_commit: diagnostic improvements