Fixes
Merge fixes