Fix registration for IBO and IPD