fix core & fix source target of many cmds