Added some more diagnostics