Arch: More minor fixes