Add a few sanity checks