Fix ARM stuff