More Fixes to Commits