Silly symbolic links and directory fix