Compilation-driven fixes for endpoint and listener