More verbose output for circular dependencies and small type fixes.

Just small improvements.