Fixed: Addons: Several fixes