Fixing issues with Service Factory integration with Neptune.