Fix logging config.
Tidy up imports