Improving logs and messages.