Various addons: Adjustments to new API