further patches to work with old/new versions of ggplot2