Logging fixups.