Various fixes
Merge