Enhance Arch check.