plugin bug fixes