Fix arch detection, using fallback uname -m (fixes #756)