Additional plugin compat. fixes.