Bug fixes.
Merge branch 'develop'