Small tweaks for Arch.