Issue #9: Some logging bugs.