Tweaks in plotting functions