Fix file commit issues