Fixed commit messages

This replaces the previous PR.