Tighten up some checks