Proper ARM buildfix.