Compatibility changes for MSVS C compiler