Fixes
Merge branch 'updated'