Small improvements: