Update x32 generator
Update x64 generator