Fixes for 3.1 support, and removing more staticpublisher crud