fix service factories