Added some more fixes for optional leakage path in recip machine.