Updates for WIN32 WIP