Making infrastructure types/interfaces internal again.
Fixed logging error - learning to count.