Updates to support ia32 and fix crash issues.