Fix key parsing for salvage