Fixes for ARM