fix some vscm stuff