More fixing of logging