Fix plugin for a couple of issues with the newer RTC client