Fixes for multiterm