Fixing commit issues