ARM fixes for 2.065
Merge pull request #2275 from jpf91/arm

[trivial] ARM fixes up to 2.065