Fix more logging stuff