Controller addons fixes