Fix further issues with older pythons