Possible fixes for non-Python 2.7 on CI