Fixes.
Merge branch 'feature'