Fixes for echo extension