Combined fixes for known Patch Report Discrepancies, Dashboard issues etc.