fixes
Merge branch 'fixes'