more fixes to fix doc generation