Add some more logging to try to track down some errors