Arch: misc bugfixes