fix the rest deprecated N1 ifdef