Updates for direct plotting of matplotlib figures