Isvcs quick fixes