Fix issues related to symlinks. Fixes #21