Fix missed link specs and cleanup.