arch fixes