Minor updates to reflect comments