Adding a few basic sanity checks