Fix a/v echoing.