fix r16 warnings