Small logging update and import order fix