Add some more sanity checks