Fixes for concurrency & obey autowire annotation