Fix fallout after doing the demo upgrade