Fixed more VS mess