Draft + Arch: fixes when working without the GUI