Minor improvements
Minor improvements