VS fixes