Updating for changes in ggplot2