Arch: minor bugfixes