Fixes on the plots