Make components play nicely with factory injections

+ some other MISC fixes.