Fixed a few plotting errors