zebra_register_check fixes