Log fixes.
Fixed automerge issues.