Fix problems with the previous symbolic-linking-enabled commit