key_commit: Fixed a couple of issues found in alpha testing