Autofac improvements & hacks for v1