empty_commit: critical bugfixes follow