Fixed remaining r16|i16 typos