Refs #77. Minor improvements