Fixes
Merge changes