This is a mostly win32/threadsafe fixes only.