More sensible checks