Finally fix plugins