Fix for memory issues and new 1D plots.