Minor fixes and additional log messages.