Added a few fixes to mocheck