Update with floreal's patches to allow x86 32bit compiler build