Add some more useful logging