commit_fixes