Fixes for HF rm_fib and more
Fixes for HF rm_fib and more