Fix sanity checks