Address some comments from thockin@