Plugin SDK fixes