Adapt to new polymer version