fix warnings on $BRANCH