Resolve EffectFactory issues

Change-Id: Ia963a989390bde4812739bfaff693736fc454162