Small fixes
Merge branch 'draft'