Fix autofac registrations;