Fix arm32 issues.
4 files changed