Add some more logging calls