Merge fixes
Merge fixes