Revert "Revert "Fixes to Commits""

This reverts commit dc007be6b931d7e8d9e0f2fc1b774c6e1e90cd9c.