[FIX] VS fixes