Fixes for 5/7, ProxyErrorListener various issues.