Fixes according to review comments
Finished feature 45302593/multiple-ancho-addons.