refs #615, #617, #622 - Small changes

See #615, #617, and #622.