Fixed some spurious OClint warnings