Add in some diagnostics temporarily.