Fixed useless baggage, net loss, and kamikaze unlocking when not supposed to