Minor fixes/cleanup
Merge branch 'development'

* development:
  Minor fixes/cleanup