Add more sanity checks