Fixing some more problems when generating docs