- Support 64-bit

Small changes to support arm64