Issue #592 - Corrections for ARM boards