SBH: clean warnings