Symlink fixes
Merge pull request #403 from Foggalong/master

Symlink fixes