Fix logging ordering'