Arch: minor fixes around Arch & Draft