fixes
Minor changes