Arch fixes