Some plugin fixes