Fix lint errors after last merge.