Clean up a few issues with the first two plots
A few last cleanups