Fix minor issues with new plugin additions