Small improvements
Merge conflicts