Re-order init code, so that object attributes are created before the thread that reads them.
Fixed a typo.
Merge branch 'quick-fixes' into develop