Fix some datachecker bugs