Added name to LINKAGE-LOCATION for debugging purposes.
Bug fix, and added name to LINKAGE-LOCATION.
Removed incorrect code.