More fixes to commits.