Couple of small changes to control plots