Fix logging...