Fix warnings after last merge