Smaller fixes.
Fixed linking.