Add a few checks