fix some warnings, re #9923