Fix for some links in issue #167, WIP