Fix Issues with Diagnostics Functions