More plugin API fixup