Cross Platform fix - removed _WIN32 and _WIN64