Merge "fix a few small typos in the FIR computation"