ssl plugin and addon fixes