Some more fixes
Solved conflicts