More improvements
Minor improvements