Fix Plugin to be compliant with new Addon framework changes and fix some possible signature errors