Fix some of the recently added checks