Some minor improvements: