CE-632 Extra links needed on WikiFactory
CE-632 fixes to comments from @michalroszka