Arch: Several minor bugfixes