Adding more sanity checks