More ARM fixes

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>