refs #2660 - Fixed some issues #2