Additional plotting changes