Fix N6 build