Issues fixes by V-Isa

ok