DIB-102: Making some fixes from code-review.

Removed some duplicate calls and updated some logging.