Make bolt-ons work again