Fix arch16n