Salvage 2 fix / Addon XML update

When it doubt, just re-fork the damn the thing.