Fix broken pick/draw values.