Changes to make canvas work again