Add haddock to tools
Remove SourceGraph build fix