fix 16B03 warnings