Minor improvements
Small improvements