Added arm64 build and fixed source