Fixed compatilibilty issues on MSVS.