Fixing typos and workaround for issue with name linking.