Updated plugins for compatibility with 3.5