more bug fixes after polymer update