Fix a test on Windows
Fix bug identified by testing on 32 bit windows
Merge branch 'ffi_port_windows' into ffi_port