Fixing plugin keyerrors