This takes care of #2 from warren's comment #8 at
http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=159267

I think #1 can be fixed in the notify plugin