Add some basic checks