Tighten up checks