Refs #2135
Fixing couple small bugs