Fix issues with factories + property injection