SciTools Understand warning fixes