Update to deal with Arch