change some version restraints to use more stable apis