Fixed more issues with commits