ENH: more fixes with labels
ENH: more fixes with labels

cpatrick/CDash,cpatrick/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,jcfr/CDash