Fixes for ARM architecture