Minor fixes
Minor updates