Fix VC compatibility