Plugin bug fixes (cherry picked from commit 3fda50de6d) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
3fda50de6d