ARM: fixes for 6.1

These are three fixes for build warnings that came in during the
merge window.