VX(Li): Made some changes indicated by code analyzis