Fixes for autofac