Minor fixes
Merge Conflict