A few fixes, now failing in key_check