Make some checks sooner