Merged Thierry's second symlink fix