Updated checks, to be more sane