A few fixes and cleanup log messages.