Update some sanity check code