Fixing Commit issues