Typo fix and logging support.