Fix linking to keywords etc.