Issues fixes by V-Isa