Unlinking fixes