Refs #1 minor tweaks