Arch: Small fixes around Arch and Draft