Fixed issues with concurrency and logger