FIX: Changes due to recent refactoring of the check functions