Adjusted various addons to API changes