More plugin fixes