[FIX] more VS fixes