Added a couple diagnostics