Some fixes for RLang plugins