Fixed some issues with plots