Fixes for IFunctionTerm domain object