Issue #212: corrections.