more fixes for external services