Fixes for symbolic links. Seem to work now.
[skip ci]