Bug fixes and other updates
Merge branch 'dev'