Fixed VS build errors