more ggplot2 deprecated changes