Minor mods to allow forked wikisearch subtree to build