Fix/checker fixes

a few checker fixes