Minor fixes here and there
Solved conflicts
Minor fixes