Fix oodiag regexp

These 2 commits fix minor issues i have commented on the initial PR of the commit.