Changes to be compiled with VC compiler