Minor code and logging message changes.