Minor updates
Minor updates