Bug fixes.
Merge branch 'development'