Adds missing checks