Work on fixing plugins