#226: Correct depencies while correct/add addons