fix a couple of compilation issue due to the removal of MultiplierBase
4 files changed