More arch16n changes