Minor modifications in plotting functions