More symlinking fixes