Fix build warning on ARM and some cleanup.
2 files changed