Fix even more logging