new arch fixes