Minor improvements
Minor changes