Correct me if I'm not reading the rules correctly, but I thought the Short Sword couldn't be upgraded (it is in majofa's deck).
And sorry to possibly rain on the victory.
EDIT: ohhhhh nevermind. That Short Sword was already in Light's vault, wasn't it.