Turn more checks into global checks