Fixes for FIR estimation