Better sanity checks