Some namespace fixes in plots.py