Improve diagnostics a wee bit