Arch: small bugfixes and optimisations