Additional MSVC fixes, including to fixed tables (temporary so Quynh can see what to do).