Minor improvements
Some minor improvements