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

ARM fixes up to 2.065