WIP: Fix matplotlib, etc. errors