Proxies missing a protocol raises differently in py2.6 + misc changes