fixes for ARM
merge