Pages Plugins fixes