Merge in fixes for 32bit