Minor fixes
Fixade merge conflicts