Add some more logging