initial fixes after polymer update