Adding some minimal sanity checks