Fix ARM compilation + cleaning