Fixed and simplified symlinks