Incorporating feedback comments: Minor fixes