fix warnings from last merge