Minor fixes. Refs #883