More version handling fixes
Try a matplotlib re-install, and fix other deps