Defiant/Competitive fix + futureproof

Will require a client update.