Minor fixes to address comments from Barbara.