Fixes to App Factory automatic dependency resolution.