Small tweaks to fix the doc builds