Some more fixes for ARM