Python 2.6 compatibility updates for CI