Fix logging messages...