Symlink fixes

Symlink fixes for #395 and #399. This took way longer than it should have done :P