Add IPsafe and fib bugs