More 2.x upgrades and fixes. Not passing all tests yet, but at least making and receiving queries.