Fix issues related to PublishingCommunity changeover