Bug fix + linking.