Some fix for clariion, datadomain and violin