Fix ARM compatibility issues

close 77