Two more fixes, Arch and unneeded include.