Refs #2830 More fixes forgot in previous commit