Fixes
Merge conflicts