Small fixes and arm64 support