Resolution of various add-in related issues | Signitic