Minor fixes, refs #385