Some plotting speed-ups