More work on profiling
Hopefully more diagnostics on failure