Minor enhancements. refs #502