Fixes #3174 fixed miscellaneous things in supann plugin