Fix problems on ARM system