2 more fixes to calm down the doc builder