Move some stuffies around, fixing win32 build