More Autofac enhancements