Minor improvements
Merging conflicts