Correct linking.
Minor changes.