Minor improvements
Resolved conflicts