Fixes
Merge conflict solved (?)