Fix commit issues