Fix demos for API changes