Better logging. Again.