Refs #367: Updates in response to review