Some plugin changes