Fix issues with logging
Merge branch 'test'