Fix GC crash.

Plus lots of new diagnostics